Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nydusify: upgrade containerd package #1512

Merged
merged 1 commit into from
Dec 13, 2023
Merged

nydusify: upgrade containerd package #1512

merged 1 commit into from
Dec 13, 2023
+3 −3

Conversation

imeoer
Copy link
Collaborator

@imeoer imeoer commented Dec 12, 2023

To import some fixups from containerd/containerd#9405.

Relevant Issue (if applicable)

If there are Issues related to this PullRequest, please list it.

Details

Please describe the details of PullRequest.

Types of changes

What types of changes does your PullRequest introduce? Put an x in all the boxes that apply:

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation Update (if none of the other choices apply)

Checklist

Go over all the following points, and put an x in all the boxes that apply.

  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.

@imeoer
nydusify: upgrade containerd package
4e469d5 
To import some fixups from containerd/containerd#9405.

Signed-off-by: Yan Song <[email protected]>
@imeoer imeoer requested a review from a team as a code owner December 12, 2023 11:13
@imeoer imeoer requested review from jiangliu, adamqqqplay and hsiangkao and removed request for a team December 12, 2023 11:13
@Desiki-high
Copy link
Member

Why not base on the latest version of containerd, such as https://github.com/containerd/containerd/tree/release/1.7.

@imeoer
Copy link
Collaborator Author

imeoer commented Dec 12, 2023

Why not base on the latest version of containerd, such as https://github.com/containerd/containerd/tree/release/1.7.

We depend on the unmerged PR containerd/containerd#9405

@Desiki-high
Copy link
Member

Desiki-high commented Dec 12, 2023 •
edited
Loading

Why not base on the latest version of containerd, such as https://github.com/containerd/containerd/tree/release/1.7.

We depend on the unmerged PR containerd/containerd#9405

So what is different between https://github.com/nydusaccelerator/containerd/tree/remotes-push-in-chunked and https://github.com/nydusaccelerator/containerd/tree/remotes-push-in-chunked-v1, you want to rebase to containerd/containerd@4f03e10?

@Desiki-high
Copy link
Member

Desiki-high commented Dec 12, 2023 •
edited
Loading

Why not base on the latest version of containerd, such as https://github.com/containerd/containerd/tree/release/1.7.

We depend on the unmerged PR containerd/containerd#9405

So what is different between https://github.com/nydusaccelerator/containerd/tree/remotes-push-in-chunked and https://github.com/nydusaccelerator/containerd/tree/remotes-push-in-chunked-v1, you want to rebase to containerd/containerd@4f03e10?

I notice containerd/containerd#9405 is from nydusaccelerator:remotes-push-in-chunked.

@imeoer
Copy link
Collaborator Author

imeoer commented Dec 13, 2023 •
edited
Loading

I notice containerd/containerd#9405 is from nydusaccelerator:remotes-push-in-chunked.

Thanks for the careful review, the remotes-push-in-chunked-v1 branch is based on containerd v1.7 but remotes-push-in-chunked is based on containerd v2.0 (the latest upstream/main of containerd), for now nydusify can only be based on the containerd v1 package.

@codecov Codecov
Copy link

codecov bot commented Dec 13, 2023

Codecov Report

Merging #1512 (4e469d5) into master (d793aee) will decrease coverage by 0.01%.
Report is 1 commits behind head on master.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1512      +/-   ##
==========================================
- Coverage   62.74%   62.73%   -0.01%     
==========================================
  Files         129      129              
  Lines       44158    44158              
  Branches    44158    44158              
==========================================
- Hits        27705    27702       -3     
  Misses      15088    15088              
- Partials     1365     1368       +3

see 2 files with indirect coverage changes

Desiki-high
Desiki-high approved these changes Dec 13, 2023
View reviewed changes
Copy link
Member

@Desiki-high Desiki-high left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Desiki-high Desiki-high merged commit 87e3db7 into dragonflyoss:master Dec 13, 2023
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Desiki-high Desiki-high Desiki-high approved these changes

@jiangliu jiangliu Awaiting requested review from jiangliu jiangliu is a code owner automatically assigned from dragonflyoss/nydus-reviewers

@adamqqqplay adamqqqplay Awaiting requested review from adamqqqplay adamqqqplay is a code owner automatically assigned from dragonflyoss/nydus-reviewers

@hsiangkao hsiangkao Awaiting requested review from hsiangkao hsiangkao is a code owner automatically assigned from dragonflyoss/nydus-reviewers

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@imeoer @Desiki-high